From: kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Date: Sat, 22 Apr 2006 09:37:24 +0000 (+0100)
Subject: Avoid spurious timer activations in migrate_timer().
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~16117^2~24
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=ac9595600a2a517d2ae3e8eba2ca7bece020acb8;p=xen.git

Avoid spurious timer activations in migrate_timer().

Signed-off-by: Keir Fraser <keir@xensource.com>
---

diff --git a/xen/common/timer.c b/xen/common/timer.c
index e62a74ee23..10985fdd8b 100644
--- a/xen/common/timer.c
+++ b/xen/common/timer.c
@@ -251,12 +251,15 @@ void migrate_timer(struct timer *timer, unsigned int new_cpu)
     }
 
     if ( active_timer(timer) )
+    {
         __stop_timer(timer);
-
-    timer->cpu = new_cpu;
-
-    if ( likely(!timer->killed) )
+        timer->cpu = new_cpu;
         __add_timer(timer);
+    }
+    else
+    {
+        timer->cpu = new_cpu;
+    }
 
     spin_unlock(&timers[old_cpu].lock);
     spin_unlock_irqrestore(&timers[new_cpu].lock, flags);